bitkeeper revision 1.1108.30.1 (410799e22TJDUoi5riSiL0r87tMEfA)

Resovled conflicts, spelling mistakes

diff --cc .rootkeys
index 25b83dff0b64d46f3003c94f4d26d87ea2847adc,671bb2c25efc4e419a2004c1d33b968bda3f1f84..be5ccf20d1999a2a5bc88abcf306c1082e57c5b1
--- 1/.rootkeys
--- 2/.rootkeys
+++ b/.rootkeys
@@@ -379,8 -381,9 +381,9 @@@
  40fcefb2vnfDbl4w_yCTedROPuqs0g tools/python/xen/sv/Main.py
  40fcefb24h-04WaHag-Tg4nxWPhTig tools/python/xen/sv/NodeInfo.py
  40fcefb2Sif__6AqrANeBQZZfvP-6w tools/python/xen/sv/TabView.py
 -41052eb8UrgtUkuJPg7oY1tutVQHsg tools/python/xen/sv/Wizzard.py
 +41052eb8UrgtUkuJPg7oY1tutVQHsg tools/python/xen/sv/Wizard.py
  40fcefb2DqteqCCZYDCvvh4Q5jBd0w tools/python/xen/sv/__init__.py
+ 4107986e6qN1IdvIDdId0AYFmDMkiQ tools/python/xen/sv/params.py
  40fcefb4rnaZNjqsBu7A5V2rlLyqRw tools/python/xen/sv/util.py
  40d8915cyoVA0hJxiBFNymL7YvDaRg tools/python/xen/util/Brctl.py
  40dfd40aGqGkiopOOgJxSF4iCbHM0Q tools/python/xen/util/__init__.py

diff --cc tools/python/xen/sv/CreateDomain.py
Simple merge

diff --cc tools/python/xen/sv/Wizard.py
index 74911426d48fcc1ea36586f80e197634cac24ac5,0000000000000000000000000000000000000000..eaec7592b625c1002ec886da319f2e70a7593f4d
mode 100755,000000..100755
--- 1/tools/python/xen/sv/Wizard.py
--- /dev/null
+++ b/tools/python/xen/sv/Wizard.py
@@@ -1,66 -1,0 +1,112 @@@
- class Wizard( HTMLBase ):
 +from xen.sv.util import *
 +from xen.sv.HTMLBase import HTMLBase
 +from xen.xend import sxp
 +
-         self.currSheet = 0
++DEBUG = 1
++
++class Wizzard( HTMLBase ):
 +
 +    def __init__( self, urlWriter, title, sheets ):
 +        HTMLBase.__init__( self )
 +        self.title = title
 +        self.sheets = sheets
-             self.currSheet = int( currSheet )
 +        self.urlWriter = urlWriter
 +        
 +    def write_MENU( self, request ):
 +      request.write( "<p class='small'><a href='%s'>%s</a></p>" % (self.urlWriter( '' ), self.title) ) 
 +    
 +    def write_BODY( self, request ):
 +        
 +      request.write( "<table width='100%' border='0' cellspacing='0' cellpadding='0'><tr><td>" )
 +        request.write( "<p align='center'><u>%s</u></p></td></tr><tr><td>" % self.title )
 +        
 +        currSheet = getVar( 'sheet', request )
 +    
 +        if not currSheet is None:
++            currSheet = int( currSheet )
++        else:
++            currSheet = 0
++            
++        op = getVar( 'op', request )
 +        
-         self.sheets[ self.currSheet ]( self.urlWriter ).write_BODY( request )
++        if op == 'next':
++            currSheet += 1
++        elif op == 'prev':
++            currSheet -= 1    
 +            
-         request.write( "<td width='80%'></td><td width='20%' align='center'>" )
-         request.write( "<p align='center'><img src='images/previous.png' onclick='doOp( \"prev\" )' onmouseover='update( \"wizText\", \"Previous\" )' onmouseout='update( \"wizText\", \"&nbsp;\" )'>&nbsp;" )
-         request.write( "<img src='images/next.png' onclick='doOp( \"next\" )' onmouseover='update( \"wizText\", \"Next\" )' onmouseout='update( \"wizText\", \"&nbsp;\" )'></p>" )
-         request.write( "<p align='center'><span id='wizText'></span></p></td></tr></table>" )
++        self.sheets[ currSheet ]( self.urlWriter ).write_BODY( request )
 +        
 +        request.write( "</td></tr><tr><td><table width='100%' border='0' cellspacing='0' cellpadding='0'><tr>" )
-     def __init__( self, urlWriter, feilds, title ):
++        request.write( "<td width='80%'></td><td width='20%' align='center'><p align='center'>" )
++      if currSheet > 0:
++                      request.write( "<img src='images/previous.png' onclick='doOp( \"prev\" )' onmouseover='update( \"wizText\", \"Previous\" )' onmouseout='update( \"wizText\", \"&nbsp;\" )'>&nbsp;" )
++        if currSheet < ( len( self.sheets ) - 1 ):        
++              request.write( "<img src='images/next.png' onclick='doOp( \"next\" )' onmouseover='update( \"wizText\", \"Next\" )' onmouseout='update( \"wizText\", \"&nbsp;\" )'>" )
++        request.write( "</p><p align='center'><span id='wizText'></span></p></td></tr></table>" )
 +        request.write( "</td></tr></table>" )
 +        
++    def op_next( self, request ):
++      pass
++        
++    def op_prev( self, request ):
++      pass  
++        
 +class Sheet( HTMLBase ):
 +
-       return sxp.toString( request.args )
++    def __init__( self, urlWriter, feilds, title, location ):
 +        HTMLBase.__init__( self )
 +        self.urlWriter = urlWriter
 +        self.feilds = feilds
 +        self.title = title
++        self.location = location
++        self.passback = "()"
 +        
 +    def parseForm( self, request ):
-       previous_values = request.args
++      do_not_parse = [ 'mod', 'op', 'sheet' ] 
++    
++      passed_back = request.args
++        
++        temp_passback = passed_back.get( "passback" )
++        
++        if temp_passback is not None and len( temp_passback ) > 0:
++            temp_passback = temp_passback[ len( temp_passback )-1 ]
++        else:
++            temp_passback = "(passback )"        
++        
++        last_passback = ssxp2hash( string2sxp( temp_passback ) )
++        
++        if DEBUG: print last_passback
++        
++        try: 
++            del passed_back[ 'passback' ]
++        except:
++            pass
++        
++        for (key, value) in passed_back.items():
++            if key not in do_not_parse:
++                last_passback[ key ] = value[ len( value ) - 1 ]
++                
++        self.passback = sxp2string( hash2sxp( last_passback ) ) #store the sxp
++        
++        if DEBUG: print self.passback
++        
++        return last_passback #return the hash
 +        
 +    def write_BODY( self, request ):
++        
 +      request.write( "<p>%s</p>" % self.title )
 +    
-             value = sxp.child_value( previous_values, feild )
++      previous_values = self.parseForm( request ) #get the hash for quick reference
 +        
 +      for (feild, name) in self.feilds:
-             
-     def op_next( self, request ):
-       pass
++            value = previous_values.get( feild )
 +            if value is None:
 +              value = ''
 +            request.write( "<p>%s<input type='text' name='%s' value='%s'></p>" % (name, feild, value) )
-     def op_prev( self, request ):
-       pass        
 +        
++        request.write( "<input type='hidden' name='passback' value=\"%s\"></p>" % self.passback )
++        request.write( "<input type='hidden' name='sheet' value='%s'></p>" % self.location )        
++                 
 +            
 +    
 +